Resolve the prelude import in `build_reduced_graph` #145322

LorrensP-2158466 · 2025-08-12T18:53:25Z

This pr tries to resolve the prelude import at the build_reduced_graph stage.
Part of batched import resolution in #145108 (cherry picked commit) and maybe needed for #139493.

r? petrochenkov

compiler/rustc_resolve/src/build_reduced_graph.rs

petrochenkov · 2025-08-12T19:07:50Z

Could you also add this case to tests?

//@ check-pass

#![feature(custom_inner_attributes)]

#![rustfmt::skip]

fn main() {
    let _ = todo!();
}

LorrensP-2158466 · 2025-08-12T19:52:20Z

I am currently unable to implement any of your suggestions; it is the prelude import that can not be resolved during build_reduced_graph. Which makes me think that this change doesn't actually do anything useful? At least the prelude import in stdlib keeps failing with every change.

petrochenkov · 2025-08-13T12:26:12Z

@Voultapher
This change should fix your issues with #139493 and custom inner attributes.
Could you check it when it's ready?

LorrensP-2158466 · 2025-08-13T13:40:16Z

Suggestions worked, however, we can't emit an error when the prelude is already set, I just used a panic for ease of use, and it was triggered when compiling stdlib:

prelude already set: [Segment { ident: prelude#0, id: Some(NodeId(479)), has_generic_args: false, has_lifetime_args: false, args_span: no-location (#0) }, Segment { ident: rust_2021#0, id: Some(NodeId(480)), has_generic_args: false, has_lifetime_args: false, args_span: no-location (#0) }]

I also can't avoid to only resolve the prelude path when the prelude is not set. Errors like these get emitted:

error[E0433]: failed to resolve: use of undeclared type `String`
   --> library/std/src/panicking.rs:642:29
    |
642 |                 let mut s = String::new();
    |                             ^^^^^^ use of undeclared type `String`
    |
help: consider importing one of these structs
    |
 12 + use crate::prelude::rust_future::String;
    |
 12 + use alloc::string::String;
    |

error[E0433]: failed to resolve: use of undeclared type `Box`
   --> library/std/src/panicking.rs:656:13
    |
656 |             Box::into_raw(Box::new(contents))
    |             ^^^ use of undeclared type `Box`
    |
help: consider importing one of these structs
    |
 12 + use crate::prelude::rust_future::Box;
    |
 12 + use alloc::boxed::Box;

@rustbot ready

petrochenkov · 2025-08-13T13:49:28Z

Okay, I see, in std and in some tests we first apply the prelude import injected implicitly, and then the prelude import written explicitly.
Let's keep it as is then.

library/std/src/lib.rs

tests/ui/resolve/custom-inner-attribute.rs

compiler/rustc_resolve/src/build_reduced_graph.rs

Voultapher · 2025-08-14T10:56:12Z

@petrochenkov I've tested #139493 with this PR and I can confirm it does resolve the problem in question, but I'm also seeing the same UI test failures reported by the CI here.

Voultapher · 2025-08-14T11:05:17Z

Small addendum, I had hopped that fixing the custom_inner_attributes issue would also resolve the change in errors produced in the where-allowed test since it uses custom_inner_attributes and a top level non prelude macro, but alas the change in errors produced still occurs.

LorrensP-2158466 · 2025-08-14T11:57:28Z

Which tests are you talking about?

LorrensP-2158466 · 2025-08-14T13:01:28Z

I also tried to make CI green, those changes are in the second commit.

@rustbot ready

library/core/src/lib.rs

petrochenkov · 2025-08-14T13:26:19Z

r=me after fixing typos #145322 (comment) and squashing commits.
@rustbot author

rustbot · 2025-08-14T13:26:24Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

LorrensP-2158466 · 2025-08-14T13:30:14Z

@bors2 r=petrochenkov

@rustbot ready

rust-bors · 2025-08-14T13:30:17Z

@LorrensP-2158466: 🔑 Insufficient privileges: not in review users

petrochenkov · 2025-08-14T13:34:35Z

@bors r+

bors · 2025-08-14T13:34:38Z

📌 Commit ff560d3 has been approved by petrochenkov

It is now in the queue for this repository.

…cessing, r=petrochenkov Resolve the prelude import in `build_reduced_graph` This pr tries to resolve the prelude import at the `build_reduced_graph` stage. Part of batched import resolution in rust-lang#145108 (cherry picked commit) and maybe needed for rust-lang#139493. r? petrochenkov

Rollup of 22 pull requests Successful merges: - #118087 (Add Ref/RefMut try_map method) - #122661 (Change the desugaring of `assert!` for better error output) - #140740 (Add `-Zindirect-branch-cs-prefix`) - #142640 (Implement autodiff using intrinsics) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #144865 (Fix tail calls to `#[track_caller]` functions) - #144944 (E0793: Clarify that it applies to unions as well) - #144947 (Fix description of unsigned `checked_exact_div`) - #145004 (Couple of minor cleanups) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145012 (Tail call diagnostics to include lifetime info) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145235 (Minor `[const]` tweaks) - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute) - #145322 (Resolve the prelude import in `build_reduced_graph`) - #145331 (Make std use the edition 2024 prelude) - #145369 (Do not ICE on private type in field of unresolved struct) - #145378 (Add `FnContext` in parser for diagnostic) - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") - #145392 (coverage: Remove intermediate data structures from mapping creation) r? `@ghost` `@rustbot` modify labels: rollup

…cessing, r=petrochenkov Resolve the prelude import in `build_reduced_graph` This pr tries to resolve the prelude import at the `build_reduced_graph` stage. Part of batched import resolution in rust-lang#145108 (cherry picked commit) and maybe needed for rust-lang#139493. r? petrochenkov

Rollup of 21 pull requests Successful merges: - #118087 (Add Ref/RefMut try_map method) - #122661 (Change the desugaring of `assert!` for better error output) - #142640 (Implement autodiff using intrinsics) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #144865 (Fix tail calls to `#[track_caller]` functions) - #144944 (E0793: Clarify that it applies to unions as well) - #144947 (Fix description of unsigned `checked_exact_div`) - #145004 (Couple of minor cleanups) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145012 (Tail call diagnostics to include lifetime info) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145235 (Minor `[const]` tweaks) - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute) - #145322 (Resolve the prelude import in `build_reduced_graph`) - #145331 (Make std use the edition 2024 prelude) - #145369 (Do not ICE on private type in field of unresolved struct) - #145378 (Add `FnContext` in parser for diagnostic) - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") - #145392 (coverage: Remove intermediate data structures from mapping creation) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145322 - LorrensP-2158466:early-prelude-processing, r=petrochenkov Resolve the prelude import in `build_reduced_graph` This pr tries to resolve the prelude import at the `build_reduced_graph` stage. Part of batched import resolution in #145108 (cherry picked commit) and maybe needed for #139493. r? petrochenkov

Rollup of 21 pull requests Successful merges: - rust-lang/rust#118087 (Add Ref/RefMut try_map method) - rust-lang/rust#122661 (Change the desugaring of `assert!` for better error output) - rust-lang/rust#142640 (Implement autodiff using intrinsics) - rust-lang/rust#143075 (compiler: Allow `extern "interrupt" fn() -> !`) - rust-lang/rust#144865 (Fix tail calls to `#[track_caller]` functions) - rust-lang/rust#144944 (E0793: Clarify that it applies to unions as well) - rust-lang/rust#144947 (Fix description of unsigned `checked_exact_div`) - rust-lang/rust#145004 (Couple of minor cleanups) - rust-lang/rust#145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - rust-lang/rust#145012 (Tail call diagnostics to include lifetime info) - rust-lang/rust#145065 (resolve: Introduce `RibKind::Block`) - rust-lang/rust#145120 (llvm: Accept new LLVM lifetime format) - rust-lang/rust#145189 (Weekly `cargo update`) - rust-lang/rust#145235 (Minor `[const]` tweaks) - rust-lang/rust#145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute) - rust-lang/rust#145322 (Resolve the prelude import in `build_reduced_graph`) - rust-lang/rust#145331 (Make std use the edition 2024 prelude) - rust-lang/rust#145369 (Do not ICE on private type in field of unresolved struct) - rust-lang/rust#145378 (Add `FnContext` in parser for diagnostic) - rust-lang/rust#145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") - rust-lang/rust#145392 (coverage: Remove intermediate data structures from mapping creation) r? `@ghost` `@rustbot` modify labels: rollup

…cessing, r=petrochenkov Resolve the prelude import in `build_reduced_graph` This pr tries to resolve the prelude import at the `build_reduced_graph` stage. Part of batched import resolution in rust-lang#145108 (cherry picked commit) and maybe needed for rust-lang#139493. r? petrochenkov

rustbot assigned petrochenkov Aug 12, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 12, 2025

petrochenkov reviewed Aug 12, 2025

View reviewed changes

compiler/rustc_resolve/src/build_reduced_graph.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/build_reduced_graph.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/build_reduced_graph.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 12, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 13, 2025

petrochenkov reviewed Aug 13, 2025

View reviewed changes

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2025

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2025

LorrensP-2158466 force-pushed the early-prelude-processing branch from 1c9ebd8 to 0ae3040 Compare August 14, 2025 13:03

petrochenkov reviewed Aug 14, 2025

View reviewed changes

library/core/src/lib.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 14, 2025

resolve prelude import at build_reduced_graph phase

ff560d3

LorrensP-2158466 force-pushed the early-prelude-processing branch from 0ae3040 to ff560d3 Compare August 14, 2025 13:29

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 14, 2025

Zalathar mentioned this pull request Aug 15, 2025

Rollup of 22 pull requests #145418

Closed

Zalathar mentioned this pull request Aug 15, 2025

Rollup of 21 pull requests #145423

Merged

bors merged commit 14e2886 into rust-lang:master Aug 15, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 15, 2025

LorrensP-2158466 mentioned this pull request Aug 17, 2025

Resolver: Batched Import Resolution #145108

Open

fmease mentioned this pull request Aug 18, 2025

Glob import causes ambiguity on nightly #145575

Open

github-actions bot mentioned this pull request Aug 18, 2025

Toolchain upgrade to nightly-2025-08-18 flux-rs/flux#1249

Merged

Resolve the prelude import in build_reduced_graph #145322

Resolve the prelude import in build_reduced_graph #145322

Conversation

LorrensP-2158466 commented Aug 12, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Aug 12, 2025

Uh oh!

LorrensP-2158466 commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

petrochenkov commented Aug 13, 2025

Uh oh!

LorrensP-2158466 commented Aug 13, 2025

Uh oh!

petrochenkov commented Aug 13, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Voultapher commented Aug 14, 2025

Uh oh!

Voultapher commented Aug 14, 2025

Uh oh!

LorrensP-2158466 commented Aug 14, 2025

Uh oh!

LorrensP-2158466 commented Aug 14, 2025

Uh oh!

Uh oh!

petrochenkov commented Aug 14, 2025

Uh oh!

rustbot commented Aug 14, 2025

Uh oh!

LorrensP-2158466 commented Aug 14, 2025

Uh oh!

rust-bors bot commented Aug 14, 2025

Uh oh!

petrochenkov commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Uh oh!

Uh oh!

Resolve the prelude import in `build_reduced_graph` #145322

Resolve the prelude import in `build_reduced_graph` #145322

LorrensP-2158466 commented Aug 12, 2025 •

edited by rustbot

Loading

LorrensP-2158466 commented Aug 12, 2025 •

edited

Loading